199e879c9be4b0c84850859d0cc7bebcb4d390d3,OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java,OsmandDevelopmentPlugin,settingsActivityCreate,#SettingsActivity#PreferenceScreen#,82

Before Change


		pref.setTitle(R.string.day_night_info);
		if (sunriseSunset != null) {
			SimpleDateFormat prt = new SimpleDateFormat("dd.MM.yyyy HH:mm");
			pref.setSummary(activity.getString(R.string.day_night_info_description, prt.format(sunriseSunset.getSunrise()),
					prt.format(sunriseSunset.getSunset())));
		} else {
			pref.setSummary(activity.getString(R.string.day_night_info_description, "null",
					"null"));

After Change


			//		prt.format(sunriseSunset.getSunset())));
			//new approach for previous 3 lines from Issue 1313
			  DateFormat format = SimpleDateFormat.getDateTimeInstance();
			  String sunrise = format.format(sunriseSunset.getSunrise());
			  String sunset = format.format(sunriseSunset.getSunset());
			  pref.setSummary(activity.getString(R.string.day_night_info_description, sunrise, sunset));
		} else {
			pref.setSummary(activity.getString(R.string.day_night_info_description, "null",
					"null"));